luci-mod-network: Correctly assign dnsmasq instance: name not number

Closes #7199

Signed-off-by: Paul Donald <[email protected]>
(cherry picked from commit 5ab0cb1f15bcb31015ae8345d302c6d023ba51e2)

diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
index c723a4505432bafc657e102d41ad73636c621db6..66abd8eb65f6900252bdea5c30a06dac779b50f8 100644 (file)
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
@@ -101,7 +101,7 @@ function generateDnsmasqInstanceEntry(data) {
        }
        formatString += ')';
 
-       return nameValueMap.get('.name'), formatString;
+       return [nameValueMap.get('.name'), formatString];
 }
 
 function getDHCPPools() {
@@ -800,8 +800,8 @@ return view.extend({
                so.optional = true;
 
                Object.values(L.uci.sections('dhcp', 'dnsmasq')).forEach(function(val, index) {
-                       var name, display_str = generateDnsmasqInstanceEntry(val);
-                       so.value(index, display_str);
+                       var [name, display_str] = generateDnsmasqInstanceEntry(val);
+                       so.value(name, display_str);
                });
 
                o = s.taboption('srvhosts', form.SectionValue, '__srvhosts__', form.TableSection, 'srvhost', null,
@@ -1079,8 +1079,8 @@ return view.extend({
                so.optional = true;
 
                Object.values(L.uci.sections('dhcp', 'dnsmasq')).forEach(function(val, index) {
-                       var name, display_str = generateDnsmasqInstanceEntry(val);
-                       so.value(index, display_str);
+                       var [name, display_str] = generateDnsmasqInstanceEntry(val);
+                       so.value(name, display_str);
                });